Remove xennull_con. Use dummy_con.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
index ea04ad7029351f10d50da281c1a8cf233c94c95d..ce2acff5a1f33a835aa343394c16b87cc87d497d 100644 (file)
--- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c
@@ -1865,13 +1865,14 @@ void __init setup_arch(char **cmdline_p)
 #endif
 #endif
        } else {
-               extern const struct consw xennull_con;
                extern int console_use_vt;
 #if defined(CONFIG_VGA_CONSOLE)
                /* disable VGA driver */
                ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
 #endif
-               conswitchp = &xennull_con;
+#if defined(CONFIG_DUMMY_CONSOLE)
+               conswitchp = &dummy_con;
+#endif
                console_use_vt = 0;
        }
 }

diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
index 37f63dab705a216ac967418dcb6ef9d31a91693a..3f9ea69ce35f80df79e680e7a8ad284862c2c5f2 100644 (file)
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
@@ -940,36 +940,37 @@ void __init setup_arch(char **cmdline_p)
 #endif
 
 #ifdef CONFIG_XEN
-       {
-              physdev_op_t op;
+       {
+               physdev_op_t op;
 
-              op.cmd             = PHYSDEVOP_SET_IOPL;
-              op.u.set_iopl.iopl = 1;
-              HYPERVISOR_physdev_op(&op);
+               op.cmd             = PHYSDEVOP_SET_IOPL;
+               op.u.set_iopl.iopl = 1;
+               HYPERVISOR_physdev_op(&op);
 
-              if (xen_start_info->flags & SIF_INITDOMAIN) {
-                      if (!(xen_start_info->flags & SIF_PRIVILEGED))
-                              panic("Xen granted us console access "
-                                    "but not privileged status");
+               if (xen_start_info->flags & SIF_INITDOMAIN) {
+                       if (!(xen_start_info->flags & SIF_PRIVILEGED))
+                               panic("Xen granted us console access "
+                                     "but not privileged status");
                       
 #ifdef CONFIG_VT
 #if defined(CONFIG_VGA_CONSOLE)
-                      conswitchp = &vga_con;
+                       conswitchp = &vga_con;
 #elif defined(CONFIG_DUMMY_CONSOLE)
-                      conswitchp = &dummy_con;
+                       conswitchp = &dummy_con;
 #endif
 #endif
-              } else {
-                      extern const struct consw xennull_con;
-                      extern int console_use_vt;
+               } else {
+                       extern int console_use_vt;
 #if defined(CONFIG_VGA_CONSOLE)
-                      /* disable VGA driver */
-                      ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
+                       /* disable VGA driver */
+                       ORIG_VIDEO_ISVGA = VIDEO_TYPE_VLFB;
+#endif
+#if defined(CONFIG_DUMMY_CONSOLE)
+                       conswitchp = &dummy_con;
 #endif
-                      conswitchp = &xennull_con;
-                      console_use_vt = 0;
-              }
-       }
+                       console_use_vt = 0;
+               }
+       }
 #else  /* CONFIG_XEN */
 
 #ifdef CONFIG_VT

diff --git a/linux-2.6-xen-sparse/drivers/xen/console/console.c b/linux-2.6-xen-sparse/drivers/xen/console/console.c
index 5523e25edf6a499d514b535a7f4a9c6ce37eab88..bf43f68cd4dbbb082f845e9f1e6ba8d827b4b406 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/console/console.c
+++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c
@@ -562,45 +562,6 @@ static struct tty_operations xencons_ops = {
        .wait_until_sent = xencons_wait_until_sent,
 };
 
-static const char *xennullcon_startup(void)
-{
-       return NULL;
-}
-
-static int xennullcon_dummy(void)
-{
-       return 0;
-}
-
-#define DUMMY (void *)xennullcon_dummy
-
-/*
- *  The console `switch' structure for the dummy console
- *
- *  Most of the operations are dummies.
- */
-
-const struct consw xennull_con = {
-       .owner =                THIS_MODULE,
-       .con_startup =  xennullcon_startup,
-       .con_init =             DUMMY,
-       .con_deinit =   DUMMY,
-       .con_clear =    DUMMY,
-       .con_putc =             DUMMY,
-       .con_putcs =    DUMMY,
-       .con_cursor =   DUMMY,
-       .con_scroll =   DUMMY,
-       .con_bmove =    DUMMY,
-       .con_switch =   DUMMY,
-       .con_blank =    DUMMY,
-       .con_font_set = DUMMY,
-       .con_font_get = DUMMY,
-       .con_font_default =     DUMMY,
-       .con_font_copy =        DUMMY,
-       .con_set_palette =      DUMMY,
-       .con_scrolldelta =      DUMMY,
-};
-
 static int __init xencons_init(void)
 {
        int rc;